Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f069221
am: 32dcd2cad4

Change-Id: Iebf13cac5308c3763c90219407437a5d010cd27e