Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev

* changes:
  [automerge] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b7f
  Prevent exfiltration of system files via avatar picker.