Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b
am: a1ccc83c8b

* commit 'a1ccc83c8beb0a99b0453104deb6538c163a445f':
  Restore labels on /postinstall during recovery.