Merge changes I303d1102,I72c9aa43,If13a5284
am: c2023317e1

Change-Id: I402de7fe5fc0e9bf56dc42f4c956c511baee78ab
tree: c9bf67bedfe49147b97104503d8abd9de82ff521
  1. core/
  2. services/
  3. tests/