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

Change-Id: I3e30271fd52f3e459e593250ecc922d63340d5c9