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

Change-Id: I70bd6b44d460ece34bc6947c34af4a0c7fcdea50