Merge "Handle unexpected cases in profile saver" into nyc-dev