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

Change-Id: I4f99e800ab955c4eea54d08034c7be14cf1233f3