* Change I87ec20e3b0c9e9559963bebe7221f51e1dd4d7f3 made assumptions that aren't true Change-Id: I898362c1888ab46afbfad3ecbf8a94a70d2f6fd7 (cherry picked from commit 8f04a50d7cb945deb9da5920948f1eef8ab88857)