Mistook these for a bad cherry-pick

Change-Id: I3cf801454146fd9e8c825fa99696c8176cc8e1c7