Merge "Unify logic for resetting properties before userspace reboot" am: 636ad74313 am: e813196585

Change-Id: Id379706942785d9729f13e617851ff4bc9e1b220