This gets both running again, but the second fails because of a behavior change in v3 which should be addressed separately. Story: 2000773 Task: 3422 Change-Id: I3d0e7268304e97fa611f70706e15212952aa3c62