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

Change-Id: I6f04a1579e6d2a3ea789e32259eb07db85c1daee