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

Change-Id: If9656486a0ce6620a88f9578d3b22e9bfdce4edd