Merge "Fix crash when measuring storage." into oc-dev am: a6bd937c93
am: fcf746b27c

Change-Id: I0166afbce7f3c058680ac5cb5dd025455d387625