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

Change-Id: I5f6f5515e304f588b33d675269a8b932a90fb18f