am 5dc158b3: am a281e6a9: Merge "Filter out the overridden packages before doing required module expansion."

* commit '5dc158b36329566dbed1fdc36b931f7d5c09f5c1':
  Filter out the overridden packages before doing required module expansion.