Merge "Address API Review comments" into oc-dev
am: 974cea8f4c

Change-Id: I5991eeceabe0b7a3488173be330bcf02649d395d