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

Change-Id: I7aa5f7ea52330d8ed7c57e707e78638e1a38806d