Merge "Perform initial grants on package change asynchronously" into qt-dev
am: cccf7f98a6

Change-Id: I0051abb7d42de64ffd1436afbba76f4832dd4014