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

* commit 'cff4736f1c4d2f15a065766d2215115e8b44057c':
  Improve resolved classes saving strategy