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

Change-Id: Idc608c75a2f95309b73e4cd2a404cbf8e9d7ad1d