Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into nyc-mr2-dev

* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil