Merge "Modified fastdeploy dependencies to ensure that fast deploy is build as part of 'sdk' target" am: 50fe7eab0a
am: 3c1bc8c58c

Change-Id: Icbb21189d37eda4aa84365cccdf08f840db28a46