am b4a5c04c: Merge "Remove code that sets user.* system properties."

* commit 'b4a5c04c305a04a876728397dec7cc809e26b823':
  Remove code that sets user.* system properties.