Merge "Track renaming of initUnchangeableSystemProperty."