Fix derp from cherry-pick

Change-Id: I08d0d58867b12f8c1120a3b54f1524da3c57c713