Merge "Fix crash when launching mobile data usage page via intent." into pi-dev am: f88dcfadbb
am: 60790e883c

Change-Id: I96b028d028a213f882558ad766b2b0cd1a994d8f