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

Change-Id: Ib61a03ad9f8c81f4014cb18895d96694b9d91f0b