Merge "Silence expandtypeattribute build-time warning."