More mobile fixes.

Change-Id: I3dbccea0a2bdd7fbf957756555acd9294b0ac326