Merge "Fix OOM when running testAddRemoveRace" into rvc-dev am: 989150cb71 am: 19639c2e09 am: af6b7f7363 am: 7c9e5312c5

Change-Id: I40c99d32eafe1eecc52f1db6d36fbf3c8e8c6b2a