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

Change-Id: Ia2e34139140dec3a5795438db35f795cac075e40