Merge "Add missing check for IsShuttingDown in profile saver" into nyc-dev
am: 29173dece8

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

Change-Id: Ie5f389bff7e7cf43b3740987d28098d4bf0bfe25