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

Change-Id: Ia51618de70427f06a8c161a3088127cde794158a