Merge "[apex] change config for doctor testing"