Merge changes Id9a22ad3,I629ab2c4

* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.