Merge "Remove static dep on ike-stubs" into rvc-dev