am 9654cba8: Merge change 3094 into donut

Merge commit '9654cba89ebf02b68bd7109df2d9f758a30fb8bf'

* commit '9654cba89ebf02b68bd7109df2d9f758a30fb8bf':
  Grant permissions to older package when deleting an updated system application.