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

Change-Id: Ia6781544898d71f7716b0f9e2a5ab0922a27232c