Merge "Don't access system properties from vendor code." into pi-dev
am: 07a988d103

Change-Id: Iac0ce9ae382019a892a116de522104f69a09f21e