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

Change-Id: I5769e4386d881127d8e0c956238bde2a9cc5be47