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

Change-Id: Idc43c3401fe3cf1f58b7c2935b95151200038ab3