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

Change-Id: I11aa36d9aeb4b3bbcf9c5135bbead8c4595b9f9f