am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '554f3a352a0a2091321cf72b4ddf32869c901dcb':
  Fix theme namespace in tests. [DO NOT MERGE]