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

* commit '29a7c68d297b6494a8c10ec1b67a8726d71f86f0':
  Avoid long sleep in ProfileSaver

Change-Id: Ie65b60d99190763aee51f7fd07ef2727d169ac86