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

Change-Id: I99e5c38cbaa1458ab0536bf13d9caf8e7040cf3d