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

Change-Id: I1e3882aa00e604c4ac23da1ac142bcf5b83f0382