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

Change-Id: I4e4c87c2adfe2048cb309eed12dd6856647ec7cf