Bad cherry-pick

Change-Id: I80727d9e309a7abc37e23eeb0944d7cb1f8b5679