Merge "Fix profile saver initial wait" into nyc-dev
am: 84c5ad8ea5

* commit '84c5ad8ea51f8fde8eedddd3dc979dcc1f6e02aa':
  Fix profile saver initial wait

Change-Id: I4ec430e720673bf19af856edab13cbd1b3199d96