Merge "fastdeploy: fix tests." am: ef6d913027
am: 41531f1a83

Change-Id: I18c22583569fb88699d2564737ed3871816e8532