Merge "Add missing return in DexManager"