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

Change-Id: I7856da34f5fea96e0c48d4553ed65c976a117fd6