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

* commit '84544de7fefa9b5052ea0418a6e238f459c5dbb2':
  Fix theme namespace in tests. [DO NOT MERGE]