Merge "Revert "Test aggressive throttling"" into jb-mr1-dev