Passing stateHandler information to the callback

Bug: 78478167
Bug: 78478567
Change-Id: Ie3334c4473037c31d87bda950239c628e219dc46
2 files changed