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

Change-Id: I20c67b3c22449a0cd030df3896b258dedee26dd0