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

Change-Id: If0f38f03b848b37adb708cf11ddf008af8b10bac