Stop gating non420 features with a configure flag. Change-Id: I8cc38fdef6a2a0968af8dfe15e7c2b3c46c531ea