Merge \"Display storage summary with correct used/total size.\" into nyc-mr1-dev
am: 92b0aa0dcf

Change-Id: I3b71d9ddde6b09b7dc8f458261e9d49f3c4340a0