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

Change-Id: I62b38cfa53356432299c3440f28884a0c4a32e39