Merge "Revert "tenderloin: enable adaptive ksm"" into ng-7.1