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

Change-Id: If5fa5c24815aba0fcc45755ae54281f69071246a