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

* commit '34f6f597901b50426b805a62bc0dbf32ef4b6692':
  Fix theme namespace in tests. [DO NOT MERGE]