am 604019c8: Merge "Fix build." into ics-mr1

* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
tree: e56d8beb4c2ced2076fe9cb335460edbe1a5280c
  1. core/
  2. services/