Metadata is not optional (to storage).

Test cases are not affected.

Change-Id: I8dd90839cb87fbccf57544f8068eece513a35bb2