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

Change-Id: I31666db97187290270023e4726e349c6b6b3a55b