Merge "Ensure deviceTimestamp is cleared"