Structure User-Agent similarly to Android app reboot.

* See I3ac919861270a08abc9cd995ddc4790886ca41a6

Change-Id: I5510dc67cfc2acc7c81e5955e0cd8d2409def95d
Merge "Structure User-Agent similarly to Android app reboot."