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

Change-Id: I095d5c9a488db01bd3dcf6b3609aa4e928311ca9