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

Change-Id: Iff34659731dc56c80b7f7f2b7875f5658c71c7e0