Address further API council comments. am: ef902503aa

Change-Id: I237fc6a82df362d5463e8e518967de28735bf2da
tree: 456570cdd5cb4eb88743dc75547e97814db0e5ed
  1. core/
  2. services/
  3. tests/