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

Change-Id: I4f7579bc9f7a185a1fd01ce4338c153ace2ce170