Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream

* goog/upstream-master:
  Identity: Add two paramter in ICsetAuthTokenRequest

Bug: 160198696
Bug: 160556107
Change-Id: I8c9e9c09153a471bac544a6cfc3bd139bbd5fc77