Bug 573710: Adapt to enhanced HandlerCollection

Change-Id: I5bf2c9d1001c23cbb06727146b816fcec7c3c75d
3 files changed