am a0946d63: am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread

* commit 'a0946d6399431d3cc86ef06d44695251ab04933b':
  Support quoted parameters