am 8639e8e6: Merge change 20200 into donut

Merge commit '8639e8e60b6b2d70970be3cadf1b66d66c4e1771'

* commit '8639e8e60b6b2d70970be3cadf1b66d66c4e1771':
  Fix NPE that prevented any package w/o license to be installed.