Merge "Check network info for metering state on AccessPoint." into oc-dev am: 73c04555ac
am: cc52c38073

Change-Id: Ia41a5112f1a85ab431d44240cabb40e72c56facf