Merge AU_LINUX_ANDROID_LA.BF.1.1_RB1.05.00.00.002.031 on remote branch

Change-Id: Ia15237e87ccfa70f38cebcca32a422013a409660