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

* commit 'd9f273fdb92d83a603d0de1c0b0bf60042ca6b76':

Change-Id: I3908703c270ba27e2c558c93a3277424aac890df