am 25df1a82: Merge "use appropriate fallback chain for style" into jb-mr2-dev

* commit '25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd':
  use appropriate fallback chain for style