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

Change-Id: I22908187e0dfefb09a3c312692612e69e444861c