Added back mass storage

Change-Id: I877ed6ab711476819a596767e19bdbd37a5593f5