- ifdef around set_metadata - Set tags as optional Change-Id: I438e370c3bf6b590dc80ba372724c47cead6cbe5