Merge "Removing redundant setTimestamp call"