Merge "init+bootstat: reduce last reboot reason to canonical alias" am: 613a5a97e0
am: cfed5e795a

Change-Id: I0a6136b68ed199b5be93ff11d47a6d802d571f40