Merge changes I85f430fb,I514a136b

* changes:
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.