am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\'...
am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '85c7b209':
Fix style resolution for styles with '.' [DO NOT MERGE]