Sync up with BeanStalk.

Change-Id: I45d091b461b9ddfadb8eeef80262c5b092083b45