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

* commit '5363df9efa02e3fa593ca5ef545335f44c63458b':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: Ief6b412b41ba0f7d81bcb6dc389178b58ff7252a