Merge "If userspace reboot watchdog triggers, don't store reason in persistent property" am: 18a65319fd

Change-Id: I749cfd4707022a5573e61281dd40edf95755892b