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

Change-Id: Ib80de2769c2ef5b1417c8704a0aace29c8d0d497