Re-Sync with BeanStalk.

Change-Id: Ib1448db36cc9aaddc1dbd0a8649b2ebe683a5530