Merge "[Re-land] Remove configs relevant to iorap"