Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f577c am: 602f473248 am: 50a5ebc463 am: 6b639d3eb3 am: 3600ead161

Change-Id: I097980dd36d85d52d597c00ee135591082090f3e