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

Change-Id: Iedd2ce7207cb8c74e9a109e8cdb6c687f45072ec