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

Change-Id: I0d577051d1a6684bebf842a2e08a06b53cb66860