Merge "Change storage size before starting test"
am: 960a21867c

Change-Id: Iebb86ca491951847f75d6be0364dcc7d524dbebb