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

Change-Id: I12af30a53385e2bc9090aacedd65b900c020fe12