am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."

* commit 'ed02fbf05c21442f40407bfaefcca35b985ad66a':
  Clean up some unnecessary system_properties cruft.