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

* commit '4df6466c0df4ce5caa3de49171c376da408e4044':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I7e0631ed3194dd9889df1752c6de259af5516583