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

Change-Id: I010888f30412f9a7c5bedf994e0be9f26dec8d7c