Also removed a bunch of unnecessary unquotes. Just use path_info instead (it's already unquoted). Partial-Bug: #1670915 Change-Id: If1af43485b4708cab6c4b5d7f6f0a334d8752518