[PLiExtraInfo] Cosmetic changes.

Cherrypicked from PLi.