Merge "Changes to support read-only apn types." into nyc-mr1-dev am: 9887baecf3 am: cd49d13266
am: eb8b2b1050
Change-Id: I902412ca2cff7a2aa4bf3a86211103b6810254c7
This commit is contained in: