Merge "Prepare comments and annotations for OverlayInfo & OverlayIdentifier public API"