Revert^2 "Allow flags to add metadata directly in code." d7d04dccb9b91a426a7a291bc1e4ef0728e3b361 Bug: 279054964 Change-Id: I8cf53ca92628366332c767a9b1709ba989c7b972