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

Change-Id: Ic10852a68d55111691aef4b0b1ec7341bdc22a1e