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

Change-Id: Ie992863a0cbc977262f9155cb4e65d4fc6201fe5