Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.013 on remote branch

Change-Id: Ic469c85877df386fa9ad1e3fe44655be3ef759ba