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

Change-Id: I4de11ffe6f27c7973d98d4842efa7759394d4189