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

Change-Id: I4179194779105523b5fd46db6ed52c9602a4d36c