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

Change-Id: I1b717e497134ffd2b68c936be4e17b800cf10f5a