Merge "Temporarily add IKE to non-updatable stubs build"