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

Change-Id: Ie24d27d010b355896e92b911d574576f42417b9b