Merge "Avoid long sleep in ProfileSaver" am: 29a7c68d29
am: af86b345c2

* commit 'af86b345c230b10a8a4c0d1dc3898a6c2f3e45e9':
  Avoid long sleep in ProfileSaver

Change-Id: I312ef57fbbc938dce5c88a56b3b1c7cfd46ca823