Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f0692 am: 32dcd2ca am: 99bfb0dc am: 4c7a2fac Change-Id: I2cc189e52cf8bdd4b8d92e2a347cc0fea24dc433