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