Merge "Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.073' into HEAD"