Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: ecc1ceb18c am: ccd7ed5888
am: c560826d4d

Change-Id: Iec9e7aff73662369b5e922626494d42c025a2cb6