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

Change-Id: I64c86a32ce28af460d875b96730b6705c6d603e3