Merge changes from topic "presubmit-am-43ba189e62fd43bfb97cbf67dd844d05-tm-qpr-dev-tm-dev-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-qpr1-dev

* changes:
  [automerge] Add pre-share key check for wapi 2p: 96aaf7f7b2
  Add pre-share key check for wapi