Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6' * commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6': Fix logic error in downgrade of system apps
Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6' * commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6': Fix logic error in downgrade of system apps