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

Change-Id: I1c31ad7d10813e6b833d002e6595394827db3db6