Merge "Whitelist reboot reasons related to userspace reboot failure" am: abe52dcb88 am: 2edb1355d5

Change-Id: I754c19ad4da454c85abcd336d42cc25e4d5874e8