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

Change-Id: Ia2dd186c2efebd31e2d8c4cda2ae63a7ed011cfe