Merge "Cleanup of resource limit tests" am: 39f58678db
am: da23b08c6c

Change-Id: I102693c752fb8fbaf9c1bac824047b5ed6d3d9c1