Merge changes I69cdbb16,I6975e0b7
am: d889cb5098

Change-Id: I3c8ddf7809a0d443587c1c4c06ef56ac302fc80f
tree: f08cacbd1ade985ba194bac13925e329bb239d2f
  1. core/
  2. services/
  3. tests/