Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8
am: 89858c58af

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9