Merge "Add getEsn()." into nyc-mr1-dev