Manual sweep of !29835 for addition of overlay metadata
Just a manual sweep of !29835 (merged), with a patch that was included after that thing was merged.
Just a manual sweep of !29835 (merged), with a patch that was included after that thing was merged.