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