Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am: 7765d7320d
am: eeac5a064d

Change-Id: If0fcf46d1f73662dbc774403e8d9be62585ef4a5