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

Change-Id: I582c6c10aa91f0ab65da9e05461a3f89766c326b