Merge "Remove a redundant param in getDefaultEnabledImes"