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

Change-Id: I01fb4997f0cfa4872ca7f1e78ce1a0a864230e8e