Merge AU_LINUX_ANDROID_LA.BF.1.1.1_RB1.05.01.00.042.025 on remote branch

Change-Id: I365e07aab9f7b0c6c51ba4e002edee98de55d269