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

* commit '233bbd9d515d16131d2e713e6909d992d27b8ef9':
  Clean up some unnecessary system_properties cruft.