Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into sc-qpr1-dev

* changes:
  [DO NOT MERGE] fpService#authWithPrompt uses correct user handle. 2p: c79346286e
  [DO NOT MERGE] fpService#authWithPrompt uses correct user handle.