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

Change-Id: I96cc0b21921d6c1fb26cff8df55b6508d894d427