Merge "Handle renamed packages during default grants" into oc-dev
am: bfc083c3a0

Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b