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