Allow metadata to be annotated

To prevent dirty diffs when inline metadata appears inside annotations.

Bug: 50060
Change-Id: I40da3d5e8e987571195142304b1a853e177e36ff
Merge "Allow metadata to be annotated"