Merge "Addess API council comments" into oc-dev
am: a9bb97993f

Change-Id: I1e521c08500bcdbbfc7fd708baa4762dbb91e39a