Allow selective variant to be used

Change-Id: I9b5d5abf387bc55fe2c75cadafca05cf09534e71