Add third step with flavor and image configuration

Change-Id: Idbaffbc30eb0699a57c0e7055392f626553343f8