Merge \\"bootstat: Fix a potential unhandled exception for malformed input.\\" am: eafeb75c49
am: c45ec807ff

Change-Id: Ia6a7ff7a57f0c6e6a012f704198b9b0128e67144