Merge "Fix profile saver initial wait"
am: 2f710e0b26

* commit '2f710e0b26049557ad52fdbfde49999e4f36d6c2':
  Fix profile saver initial wait

Change-Id: Ib8233e390b99eb86d4a7f24bc7f334a7a7ef2a8f