Merge "Merge "Fix OOM when running testAddRemoveRace" into rvc-dev am: 989150cb71 am: f93eedda40 am: 706c405739" into rvc-qpr-dev-plus-aosp am: 105e2b2ee2

Change-Id: Idda96235c33e50bf51051f9442f321856ce254d8