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

Change-Id: I74253fbfd328059923715b7a7ad51ba585049bac