am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."

* commit '587d8313d6d9d9f44ac2d8702676c02c792e1bf3':
  Clarify the meaning of KM_TAG_MAC_LENGTH.