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

* commit 'af72d494d2f2e7872e268df710b7f96b5631fe60':