Merge changes from topic "presubmit-am-bb6bdeffbe264443beaa80847af446d3" into tm-dev

* changes:
  [automerge] Add photopicker icon and label 2p: a6ff994857
  Add photopicker icon and label