Catch up with BeanStalk.

Change-Id: If4d187614d3213e8baf4ef9f9d8e3b90b3892762