Some make and model information was not being reported correctly to the license server. "HTC One X+" was encoded as "HTC+One+X+" instead of "HTC+One+X%2B", which when decoded becomes "HTC One X ". Make and model information is now correctly url encoded. Merge of https://widevine-internal-review.googlesource.com/#/c/9240/ from the widevine repo. b/12722013 Change-Id: I987691c850648f92b408f8749327ff43b13b43a7