Merge "Add the specific string for the tablet device" into nyc-mr1-dev