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

Change-Id: Ic646229eae25012b45b9be0f28f99c24d05327ef