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

Change-Id: I85de5c2590b7837b9555facc5f221c3a85a6aa93