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

Change-Id: I838c3a83457ab9e1f7226e6ec146ce884393a609