Merge "Change --fastdeploy behaviour" am: 17d41711c6
am: 6edd97ed72

Change-Id: I52bc06d484e964fadaea683786d38d90bb932663