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

Change-Id: I509e41c775b7aee66bda99fb83f1e14be480ab60