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

Change-Id: I52ea56d1ca015213d5610b7fd0e7195c38ee7f71