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

Change-Id: Ibfbea283082b53d45bbd0f3a5b0fe4f1613b52b8