Bug: 62106274, 35698183
Test: StorageManager robotests
Merged-In: I1788d6143362130df88950c6843fa78b67182d5e
(cherry picked from commit da7332c070)
Bug: 62106274, 35698183
Test: StorageManager robotests
Merged-In: I1788d6143362130df88950c6843fa78b67182d5e
(cherry picked from commit da7332c070)