currently protected by CONFIG_NON420 as v1 is still not entirely stable Change-Id: Id1c5081b04a2c47a842822048b8804be67d23a6d