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

Change-Id: Iee2b9fe917442e4daa724df3611daacb1bcec54a