Merge AU_LINUX_ANDROID_LA.BF.1.1.1_RB1.05.00.02.042.018 on remote branch

Change-Id: Iab88d2aac535ceedb4d0fca1c2c16c3bb9c59d67