Merge tag 'lsk-v3.10-15.05-android' into develop-3.10