Mobile updates.

Change-Id: Idb55c3800ebaa9483677964bab845d0aded6357a