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

Change-Id: I17d124844ec3adde1cee73297066c36542cb0517