am 12ef4ba4: am 8c195ad7: Merge "Implement addAuthToken"

* commit '12ef4ba427e3a8a393ad664470ed190951bc0b6c':
  Implement addAuthToken