Fixup user_agent patch

Change-Id: I60014b97b605439c46b0eec730f15aea568845db
Merge "Fixup user_agent patch"