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

Change-Id: Ia87c911047ba341b70f8d77dd9a58c761ea923e2