Merge "Handle unexpected cases in profile saver" into nyc-dev
am: 26851843f3

* commit '26851843f38e3d5c1e418fdfdc785a2bae3f3486':
  Handle unexpected cases in profile saver