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

Change-Id: Ia7cc9830a2c15688a9e77079b7bc545f3a970fc6