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

Change-Id: I95ebd3c832ee02d2b5a320f49cc8386a7089013a