Merge "Improve logging in bootstat." into rvc-dev