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

Change-Id: I39cd010971b31bbf3ee78b0b0d7d5fa2cb39d025