Merge commit '7063b13334ea602aac9459725eb92c6930c0e271' into nyc-mr1-dev-plus-aosp
am: 93bd12233f

Change-Id: I3de8f91b1c9d0160ec58be8347502769580e0159
tree: 277a80921680f92f8456065d53f0e0b043860fff
  1. core/
  2. services/
  3. tests/