Fix incorrect scalar $values param

Bug 1401324

Change-Id: I82cc854004937161c29d74a6c26fc6a00352470b
Merge "Fix incorrect scalar $values param"