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

Change-Id: Id2ce41e1484b37fc0353183b4ba94c953c58e935