Merge changes I3525edc3,I6e18915e am: 7752ddf0b7 am: 098a24b8d4

Change-Id: I85b8798fc82873d22c338937bb61092fbde259e6
tree: 922a40aed2360f20cc24a028b1f384980c05c8c6
  1. core/
  2. services/
  3. tests/