Merge "Change getEnabledComponentOverrides return type"