Adding support for call overrides

Change-Id: I80672417ac6a16673d80222efc600af9d88fa8f5