Merge "Make TimestampedValue Parcelable" am: 81a705690b am: 209c74f8b6
am: 4055cdd965

Change-Id: I2e507f9cef730c1032767500d36dc0397499c310