Merge "Cleanup construction of Value instances"
am: 5b35c3351b

Change-Id: Ib5b846458e00c7783e439b16ca2eb6676c7c5b78