Merge "fastdeploy: fix tests." am: 447fd4e763 am: d3ddf37fcb
am: 93b927204e

Change-Id: Ia2bd8c44cb4793c72a11354e0cfe5d34c3bdcebc