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

Change-Id: Ic62865cc23a1b9e70f595e064cd454b963182ced