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

Change-Id: Ic09e99b589d8f8f8a7bdd470a5289588a7c30208