Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f57 am: 602f4732 am: 50a5ebc4 Change-Id: Iff34659731dc56c80b7f7f2b7875f5658c71c7e0