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

* commit '851f3aa51c8c4183c8d3578319bc1d5acfda2810':
  Track renaming of initUnchangeableSystemProperty.