Merge "Fixes a string for tablets/devices" into nyc-dev
am: e0892e1

* commit 'e0892e16adb55e3f0b368b9d461efae09bf38c5b':
  Fixes a string for tablets/devices

Change-Id: Ia183de4fa9330a6e89bb53d2f16d5a0a8f286456