Remove UnsupportedAppUsage, use correct State* classes am: cdfc9f3809
am: f25a0bf1b5

Change-Id: Ib6933d2574a31a959484df22d8135829f249a6b6