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

Change-Id: Ib008b0dbd3b4e9babbab50753b51182b900fd36e