Update for improved glue.

Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
6 files changed