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

Change-Id: Ibca59a8c4c0ed2f4145923d4fe91774e264b734e