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

Change-Id: I553150a4f5fa8b53f5c1e1744002d8f8134c48c4