Merge "Add truncate timestamp annotation to BytesTransferByTagAndMetered"