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

Change-Id: If0257162295cbc1583316e67965613dbee921c73