Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: bc388ae1a9 am: d6b4143b67
am: 3ea90e3152

Change-Id: Ic6d639358c3310820bd925df93d4843d7edffc57
tree: 77971a1789e54ce1d6a3af0eb79cc8a1636c29f5
  1. core/
  2. services/
  3. tests/