Sync up with BeanStalk Repo.

Change-Id: If319ccced3fd6481ee43b32443438af304b27469