Merge "bootstat: add .* positive/negative test" am: 6fbefd1806
am: be32ed52ed

Change-Id: Ica8cd3682023bf6ccebc44238e60d1d3ab36be83