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

Change-Id: I336b7cb67dd80930d760ca8b2cd4e6c96f9cc23d