Merge "Add build variant to kernel command line" into nyc-mr1-dev