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

Change-Id: I136cd834cdeeec918317ff265f3eb8dd7aff0569