Added support for multivalued controls

Orignal Commit http://review.cyanogenmod.org/#/c/33646/

Change-Id: I584406915cf5d72217f33412860687ea38e84f58