Merge "Improve resolved classes saving strategy" into nyc-dev
am: 4ea8bec

* commit '4ea8becfbfd73ac03ece671956d7c2cb3bc755af':
  Improve resolved classes saving strategy