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

Change-Id: Iffd44dac3464c1bba666c2cb17e436f7502f03bb