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

* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.