Merge "Don't retrigger bootstat during userspace reboot." am: 64e28438c8 am: 5ebeb57439

Change-Id: I43a6872b112691e03c60c4e5bc8a9ac323d52d68