Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev