Merge "roots.cpp: Clean up format_volume()." am: 8eef26cf3d
am: dcd272fbb1

Change-Id: I6983e9df9c4e7d4740050d69fd2522639c2c673d