Merge tag 'lsk-android-14.05' into develop-3.10