tenderloin: remove merged cherry-pick

Change-Id: If4ec01d03338cf5fd94bb4a0aff8a672febedfa1