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

Change-Id: I1d3dd33065eb5181a6bfb4ab938d4eb6164c8c1c