Merge "bootstat: Log even more boot reasons." am: 29b9411685
am: b4c27af150

Change-Id: I411e73d18c2977799b0d7855b0ce48c5edcdc338