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

Change-Id: Ia2bd8c44cb4793c72a11354e0cfe5d34c3bdcebc