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

Change-Id: Ia7ff5423d2009615fffd4a3800c43fc63feca5fc