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

Change-Id: Ie94b4a3a187fd2a8db9e16f7968136f9277673d9