Merge "Add a variation in generate-package for future devboards" am: 81fa95978b am: 27de578142 am: f20027396e
am: 1401af3a0c

Change-Id: If0d29fd6529dc0a4a97613dad448f194872f3b1e