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

Change-Id: I488fb6ee6f8c16cb68ccc93fb46ecf92898f3942