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

Change-Id: I0a5e8dff4c008306517bb97ca1ef8bc24460b251