am 0d385d1c: Merge "Track renaming of initUnchangeableSystemProperty."

* commit '0d385d1c625a5ef3ffdeab3f63a2171eecbb1e44':
  Track renaming of initUnchangeableSystemProperty.