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

Change-Id: I1f8d5549d9c3e3296e28a49ed1dc2a7c112484fb