tree 0e23c6df416d3a327c9e8b676f6a9d764c63127d
parent 85d0eee1a840ae78f31f2f02a41714803ab41e7b
author Garfield Tan <xutan@google.com> 1488413123 -0800
committer Garfield Tan <xutan@google.com> 1488487693 -0800

Address comments from API council.

Test: Code builds and tests pass. Also some manual tests around ESP.
Bug: 35813037
Bug: 35812990
Change-Id: Ia9d3a3964e9a83d0c1c08e5db4c2e231504aa99a