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

Change-Id: Iec23feb37623125ff404aa3047ec4fd3c750e3bf