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

Change-Id: I3f312b9766e2333d186c1757122d5bf15809478a