Merge changes from topic "presubmit-am-1ab3ffc180ef400a970f85dbe14238c7-sc-dev" into tm-dev

* changes:
  [automerged blank] [Ongoing Call] Don't call #getIntent to avoid a security vulnerability. 2p: b029b005d8 2p: e981fd1073
  [automerge] [Ongoing Call] Don't call #getIntent to avoid a security vulnerability. 2p: b029b005d8
  [Ongoing Call] Don't call #getIntent to avoid a security vulnerability.