am f2c5a9e: (-s ours) am b9efa1e: am 14a4e69: am c735197: (-s ours) am a3966c6: am 6274394: am 8c71ff2: am 87234e8: am 9c48ab8: am ccf7b2a: am 5af7324: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]

Author: deepanshu-