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

Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a