Merge "update CRITICAL annotations for mainline"