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

Change-Id: I89a23266281bf21472b93c60cb0e56429d92201f