am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev

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