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

Change-Id: I5391addf628a8f908305523b46fb783f98463c96