Merge "Find graceful description when missing disk." into pi-dev
am: 676e86d7fa

Change-Id: Iadf3622d3cb5584da367b5efe4e28d376b679a45