Merge changes I195d894e,I7069c111
am: ff8b7b351b

Change-Id: I8e41058df03284ca677bf67930c5702d7d6c63bb
tree: 139b612026f048bc46b0f744de04b8984e4b5c10
  1. core/
  2. services/
  3. tests/