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

Change-Id: If4ba26060718544833b9838e290570ad9f36d734