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

Change-Id: Ia45ebfa0357da4b3a26ef425da9f9138c893098a