Merge "Test that KTPI is enabled" into pi-dev