More mobile tweaks.

Change-Id: Ifa7e5a8d3d780cb3103fa296f7ed8bf1434a29a6