Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d am: dcd272fbb1 am: f93a103587 am: 264caac23d
am: b41d074c9d

Change-Id: I41fff0227044d09f5c3eb9de72a67519e082f488