Add caf-new variants... because they're FROM THE FUTURE, like microwaves

Change-Id: I19e69cfe34342fabe436cd64b2735e1ed67d5d3f
Merge "Add caf-new variants... because they're FROM THE FUTURE, like microwaves" into kk44