Consistently use 'variant_id' instead of 'variant'. Change-Id: I93f054634698855687e3ba07b83173c8370297fd