Merge "Don\'t do any I/O when starting the profile saver" into nyc-dev
am: a833974c69

* commit 'a833974c6991fab4aa06c622454fe41001bc620f':
  Don't do any I/O when starting the profile saver

Change-Id: I451095eddf40890a778dc0d03eb4303f724f027a