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

Change-Id: I4d9afe91fdea9c5819e4d3d744ac784304abcd19