am 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure."

* commit '6b5b8ba98e1caaa91693238e79bfe5b7d988ce5c':
  Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.