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

Change-Id: I243783c211b750a67fc06f22fa9e80742e28017c