Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev