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

Change-Id: I005b6602b3b30d5c2aaf48579b10efb2c51eefa8