Storage NG done. :)

Change-Id: I1680b4c8759324c17e2d033d611ed5c43441e5ce