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

Change-Id: I9a925e6af34cf6418e5241916312529053639dbe