Fix UA to provide phone/tablet info

Also change OS name to let UAParser parse it.

Change-Id: I3ac919861270a08abc9cd995ddc4790886ca41a6
Merge "Fix UA to provide phone/tablet info"