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