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

Change-Id: If6902b6ec2fcf35ac3deab4eae21080413ad02e0