Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f577c am: c9db298ee0 am: 0e49541693 am: ca769c1e9f

Change-Id: I0cbb17d81f8c7707ea014a17dcb6d3120d718424