Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 am: 89033ea614
am: 6dbcb509df

* commit '6dbcb509dfd1b5ad630db8124b7be2a33c4e5ea9':
  Delay grantDefaultPermissions until user's first start

Change-Id: I248fa24de991c1f65873b68a06e9c66109e05a31