Merge "[NFC] Align pointer to type."