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

Change-Id: I4eca9ea918d2fa22db467a69cafada09bbd94d52