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

Change-Id: I9edaf67a24c6486a6aa82c7fcbda9fced1addcdc