Fix the fix: "? :" -> "?:"

Change-Id: Icdbb200faf2ee5c7c6a0095987f76a2bc1b4e5e7
Merge "Fix the fix: "? :" -> "?:""