am 9ae9763b: Merge change Ib097fbbf into eclair

Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
tree: e9389d86ceeca8dee0c3797fc821cbcf98ae890e
  1. core/
  2. services/