Merge "Address API council comments" into oc-dev am: 4c60abc9ae
am: 4ad7cb3347

Change-Id: I676b6f5d97a893c478c2f0e02efa17456c178a17