am ec968085: Address API review comments:

* commit 'ec9680853b8526568a96805e38af77f3c6da175a':
  Address API review comments: