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

Change-Id: Idaeafa40c6665147adbd6f47e2feca191c245790