Misc mobile fixes.

Change-Id: I1c35278dd63bf88a01bc37755d7866b94ce2f68d