RE-Sync with BeanStalk.

Change-Id: I86e69979baaec20f0ea51e721d983a7c80caa454