In favor of the more recent, less error prone overrideConfigValue(s). Change-Id: Ie3aa275f5d670c19d3f69467ed0b9383405f1440