Merge "Add missing check for IsShuttingDown in profile saver" am: ca87756577
am: f6c3457cd2

* commit 'f6c3457cd2ba4d6417c81bf969cc071439ffff7a':
  Add missing check for IsShuttingDown in profile saver

Change-Id: I35ab0998c78ba8e8cbd3d8f21693bfff1cbe1385