Fix cherry-pick derp

Change-Id: If071b0c1582835aa8c6949ad68522cbee15670e5