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

Change-Id: Ic831a5c7fefa601d302ae76fcaaf4284c903acb6