Add string support for valueFrom/valueTo

b/15910407

Change-Id: I557e855f7d16e2eb0452d43ca6a672acdcae2071
2 files changed