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

Change-Id: Idf127e7d741690849d5e8ce528a7fa17d77b8775