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

Change-Id: Ie8b29231c8e597c95f70629896d345514ee02fef