Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
am: ba9ab17434

Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af