This patch also updates the smoke test to run bionic-train.

Change-Id: I0ba45f400cde80ab4ec86e7ceb88dea786c74c82