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

Change-Id: I5d797f8f9b69ccf73e3adfb6d72fd1cc042393b1