Merge "Cleanup of resource limit tests"
am: 5bb84059ba

Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206
tree: 84d8b667863eb8d46bf70c98cb65c193f84ee788
  1. core/
  2. services/
  3. tests/