Merge "Improve logging in bootstat." am: 2884943687

Change-Id: Ie6d6012afd1df347303f4054eee1229d98a80be8