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

Change-Id: I2ecc3baf9913297bba79f8e3f2dfb54be65832ee