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

Change-Id: I4f20e35353dd4eaa2979ea506dfedd362b8b1b76