Merge "Fix string where it says "phone" on a tablet." into oc-dev
am: efed517a8a

Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f