Merge changes from topic "presubmit-am-f3e32cdb45354aea91e6b31fe4db7c93"

* changes:
  [automerged blank] Fix brokn theming test 2p: 6d8acfba32 2p: 1595183a0c
  [automerge] Fix brokn theming test 2p: 6d8acfba32
  Fix brokn theming test