More mobile fixes.

Change-Id: If9b95a1b7e78b85f5510058ec9b5b0cda9d9670f