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

Change-Id: Ice19f3e22eadf8a179e944b789a5a004e18cb10c