am f8eea801: am b721e8f4: Merge "Clean up property setting code."

* commit 'f8eea80110a7bc928372396f4e0c65e7dec58f72':
  Clean up property setting code.