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

Change-Id: I57268e653124bfc99b0d2cb36b357b5c8d57983a