Merge "Add missing truncate_timestamp annotation" into rvc-dev am: 1221e902b4 am: 23bc972cf8

Change-Id: I2a23b6ea6ef3ff9bd584a8abefedd226c245c6ee