Add override for J3307.
Merge branch 'master' into prod