Merge "Set CVR qualifiers in QualifiedTypeIR." am: 21147e4d93
am: 98b799f46a

Change-Id: I8327c87145b0b1a1f72668d0ca4115a014c2ed26