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

Change-Id: Ie45fc3ffc6aa284e20fd17ee58e9be59ec6ba319