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

Change-Id: Ib35e4b64dfb71cba7e1d0cbeebd308bd5d624215