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

Change-Id: Ia21fb8a8473bc36b682eca63b24ecebd1663c88c