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

Change-Id: Ic231992bac93fb28ca64b29e197b39e2e5a3ebb4