am 1a95a5c7: am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev

* commit '1a95a5c7201385744851da7c17407a6399d3ec0f':
  Fixed a bug when resolving theme attributes