Merge "Handle unexpected cases in profile saver"