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

Change-Id: I1bab5fafa53d8542834dd8e39f0e4fc8d3be7a08