Merge "NPE fix causing test flakiness." into rvc-dev