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

* commit '6447479103d732f084b7e8f050580e317dcd5040':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I9e666bda47dec2066588d6d7b974655f65dc5f6e