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

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