Fixes a bunch of issues with delegate method signatures.
Also cherrypicked commit 664d6f1fe4
which is needed in this branch also.
Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
Fixes a bunch of issues with delegate method signatures.
Also cherrypicked commit 664d6f1fe4
which is needed in this branch also.
Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330