Merge "Improve logging in bootstat." am: 2884943687 am: 41b977a1fa

Change-Id: I34cd2c0fef185c01c39ed970f98402efb421517b