Merge "Small clean ups for issues raised in reviews of fastdeploy"
am: 5e26856b98

Change-Id: I6daefb88fd59e0c736b5f9729f477a58533e8b54