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

Change-Id: I2e50f057143aaf9311d967dcc774553b399706f5