r819: custom -> omni

Change-Id: I78c17344c41dc40a502d234d3198d18166191f05