Merge "Link PlatformProperties statically" am: e6dfbe59c7 am: c39b19776b

Change-Id: I85f5758745d929361e192c61843951aad35ba888