Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.013 on remote branch

Change-Id: Ifadf5b9c50b515e5564b77423dc8164c931658b6