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

Change-Id: Icc0ea5b19483d893294cadc9de8b8a3c63c598af