am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\'...
am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit 'd8d3e87c':
Fix style resolution for styles with '.' [DO NOT MERGE]