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

Change-Id: Id7e9dee1d8a72cd76a246a3eadfdd0ceeae29067