Merge \\"Check cell radio flag before enabling APM\\" into nyc-mr1-dev am: 48ed6a0b60
am: 0371525d58

Change-Id: I07583c43a0f2908023fa9be5c964cdd474b135c7