Merge changes If8c8d1f3,I3a804a9f am: 49c185e487 am: dff0d295a9 am: df7c6a7ab2

Change-Id: I69e6b412f150419baa9dc1860d190d85bfdfc47d
tree: b0662b8eb5fe62a835b3ff7086a5e369fc1a274d
  1. core/
  2. services/
  3. tests/