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

Change-Id: I03e88aa260f0cfb1d8905f37cb083224de6e85d9