Merge "Add TimestampedValue.toString()" am: bfa58946f7 am: 494665870f
am: 252382bede

Change-Id: If79479053e5139da52be2c004203077537613d40