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

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