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

Change-Id: Ia09b5c76cc1dc5ae1a1774cf314b3836e8b30a3e