am ccc802e1: Merge "Support quoted parameters" into gingerbread

* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters