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

Change-Id: I3b20c370862be3b803ac7a941dc0fe894c21d666