am e4cd4512: am ddf07b41: Merge "Reuse system properties for p2p" into jb-dev

* commit 'e4cd4512d684c23a31fbb91c65e2283d7c16d415':
  Reuse system properties for p2p