Merge changes I303d1102,I72c9aa43,If13a5284 am: 1aaf45bf89
am: 5001af80ff

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