am 57c83bb4: Small fix to 5008973 fix.

* commit '57c83bb4e69034efcfe45f19a8d44955f4921c3d':
  Small fix to 5008973 fix.
tree: f81e19334bf0bc07a49c29d354982d27f48fe251
  1. core/
  2. services/