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

Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206