Merge "Remove samsung/manta no-op."