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

Change-Id: Icfb8ece10dd891a63f4878caeb06a1a217b78b60