Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
am: d49ba144f0  -s ours

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