Merge "Avoid excess master queries in getTimestampFromId"