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

Change-Id: I31ffaf5fb52b1c0ce998ef1138f36656e818c362