Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f577c am: 602f473248 am: 50a5ebc463 am: 6b639d3eb3

Change-Id: I7d3bd02d6335470bbfc52cec0b2e592fe80991f8