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

Change-Id: I3c5b4194dfe8b0603b8a6d2697f6389888c67ecf