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

Change-Id: I1dbe256f7484d23853c6ee0a871280a68455252c