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

Change-Id: If569710f188e656b009a48c6e8908a26a6e955ec