Merge "fastdeploy: fix tests."
am: ef6d913027

Change-Id: Ib8032c617fa55d68e9f77958e3523f4d8e14f384