Merge "Fix: local manifest deprecation warning appears more than once"