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

Change-Id: I5a1f2a470da817cbbb82a7b6ca51ba4d9a1617e7