am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.