Make require_package() faster and leaner

Change-Id: Ie3cd584c38d2b4636d3c68fc5f13658152f4b57c
Merge "Make require_package() faster and leaner"