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

Change-Id: I9a249b484e399adad4676bb4aaa2982beda88250