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

Change-Id: I23d582970e6607a450d6011d5b8926024609486c