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

Change-Id: If26dc3a8a969ad63f250608427480996c3b02845