Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f577c

Change-Id: I65c97ca0d0ed55365f40dd1756146423f0a4fa0f