Merge "Lower case the first letter of storage type." into oc-dev