Add optional original name and value args to constructor

Change-Id: Id881449d0683df073b37cc1807c7b45348c2a270
Merge "Add optional original name and value args to constructor"