am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\'...
am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'b8e4e8e1':
Fix style resolution for styles with '.' [DO NOT MERGE]