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

Change-Id: I75a8043a452a190eae90f167f533e1c17e9b1684