Merge "Improve ProfileSaver to cache data and do minimal I/O" into nyc-dev
am: c7bb728

* commit 'c7bb72887b0cbad6b8c6a550baa6524011d91c76':
  Improve ProfileSaver to cache data and do minimal I/O