Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev