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

Change-Id: I72f903ceb300a42d33ed501b0415395258139b5b