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