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

Change-Id: I81bac212c3770feaad189d8e9a216fea16488483