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

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