am 1b986cc4: Merge "Fix a bug with manual pick then dotcom key"

* commit '1b986cc488e7fb238c88b8cfe8e57bdbd494e56f':
  Fix a bug with manual pick then dotcom key