Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f57 am: 602f4732 am: 50a5ebc4 am: 6b639d3e Change-Id: I7d3bd02d6335470bbfc52cec0b2e592fe80991f8