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

Change-Id: I16730bb7e77f6cbf172970916ce03aab033b1e1c