Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am: 77df46efec

* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I463332a4a8e3113749de2a0179c086f45a07c7a3