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

Change-Id: I6fcfe206fdd24d6bead5df54b4cfa236afa5fecf