Merge "Fix null pointer exception of calling NetworkInfo.mState.name()" am: ecc1ceb1 am: ccd7ed58 am: c560826d Change-Id: Iec9e7aff73662369b5e922626494d42c025a2cb6