Merge "Fix style resource loop" into nyc-dev
am: 612458820a

* commit '612458820a72043e75d9c6c5ad69abff7b550525':
  Fix style resource loop