am 19222ad5: am 64406699: Reconcile with ics-mr1-release

* commit '19222ad532f7127278c4ce54b77cb282721ac061':
tree: dbfb347877227b275da86afce783e83c7d63224c
  1. core/
  2. services/