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

Change-Id: I8e57c5fbe180c45c451f0c01226f2aa904da6660