Change-Id: I5cd9556875df3d79568ccd7797aa81bcab731193 Fixes: 37322490 Test: GooglePartnerSetup/tests builds