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

Change-Id: Ic6e4fb1f410bce978cee82f686d5c5ab30803b38