Merge "Update comment about enterprise contact id and lookup key" into nyc-dev