Merge "Added keep-uninstalled-packages DO policy"