Merge "Remove unnecessary checks for internal only addStartInfoTimestamp" into main