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

Change-Id: I357e293c1b7bd4ab38d26a85010145e6c9226f15