Merge tag 'lsk-v3.10-android-15.02'