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

Change-Id: I2cb35df823f4cf11a47abc2cc67d0794d555d4b7