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

Change-Id: Icc973b45aaf2ac3a0a803b6affe8c72eb34d253a