Merge "Fix OOM when running testAddRemoveRace" into rvc-dev am: 989150cb71

Change-Id: I5eed5b8448f5565701c4749e21c09b97700e99c5