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

Change-Id: Ie18f90e0e3130b549f554ac895759fba9f7593c7