am d34e1155: am 5f474fcb: Merge "Edge case: overriden system package moved &...
am d34e1155: am 5f474fcb: Merge "Edge case: overriden system package moved & became privileged in OTA" into klp-dev
* commit 'd34e1155':
Edge case: overriden system package moved & became privileged in OTA