Merge "Restore labels on /postinstall during recovery."