Merge "Add resources for API 27 and 28." into oc-mr1-dev