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

Change-Id: I715087adfd24a32636382102d0a00a0d135d7cc7