Merge commit '477f1e58308678cfca2559bf9af19be1c1e6da24' of sso://googleplex-android/platform/tools/tradefederation/prebuilts into HEAD
Change-Id: I166a9dda5fd01338f0cfcee6d724533948e1425b