Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev