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

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

Change-Id: I8a7d147837e098b05afd1c098883c53a0dcbce5c