Merge commit 'goog/eclair-plus-aosp'
tree: f0128d3ea37ae97b0a76421c655ce164acacb892
  1. core/
  2. services/