Merge "Fixed initial metered state of new policy." into nyc-dev