Merge "bootstat: power_on* handling" am: 91338a6aa2
am: 61c7cc6d88

Change-Id: I88c240b3f730095237f0c79d2e15f3385c3ce7a1