Merge "Apply the whitelist of actionable system properties"
am: 2c4f487dfb

Change-Id: I4668917ec7e27640a95a577e816afd72f37db91f