Unifying the two different state listeners

Bug: 123376689
Change-Id: I61d4865044a1bd27ee78002a4083a686233740b7
3 files changed