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

Change-Id: If5c6767d82e86fd37724fc4665c1b5fd6cf0ba4a