Merged UprOpcode with CommandCode.

Change-Id: I9a94cae4fc9559a560b252099ab547de3ddc5c9b