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

Change-Id: I78594ed32f3d01a8ea3900605d449cbd7bf1add4