Merge "Handle renamed packages during default grants" am: 140b101fcd
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants