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

Change-Id: Ic5b5b663ec6bf88e647f4ee9958fe733970cb94b