Merge "Reduce test 051-threads to 128 threads instead of 512"
am: 6efac9929f

Change-Id: I0adb9514cfbc73e9572b0921cc76c193714b7b64