Fix Delegates

Change-Id: I2b6a6b679b7a5b2532b76b723155bc2763b70768
7 files changed