Merge "Changes to support read-only apn types." into nyc-mr1-dev