am a511eea8: (-s ours) am aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."

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