Changes from BeanStalk.

Change-Id: Ie901360157df93fbca5cb22c62bb96b45dbc6265