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

Change-Id: Ica61d90a351e3f955cb5fd6f1fd7b00818aa0f58