Optimize state changes

Change-Id: Iae59bc8dfd6427d0967472462cc1994987092827
10 files changed