Fix pattern matching when replacing to avoid syntax errors

Change-Id: I73aafaad964e39fbc1aa15a8e11458946e0c26e0
Add wine to app list

Change-Id: I829f1a2c4cb7a4954bac9bfdc71c19864311c057