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

Change-Id: Ibc8c851036eb4c29f886238259fa7388de377333