Merge "Check cell radio flag before enabling APM" into nyc-mr1-dev