Re-Sync with BeanStalk.

Change-Id: I9bc9b9ec944efef0404b220fdd456ae9f8b574a8