WIP - Quickly enable/disable AFTv5

Change-Id: I7029a628ba724ba53f3aaebbf98e3d652c823464