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

Change-Id: I5c47211d5f6aea8b2479a687fb8e8a0a1e04ae7e