Mobile updates.

Change-Id: I3bfd8c1f099086c1707812c1d3dc6270f2f74a66