Revert "proper update device state at end of invocation"

Bug: 26556751
Bug: 26548149
Bug: 22950992

This reverts commit 3a093e55a99e960e54c6077bfeca5a7fa383af9d.

Change-Id: Ib359824a4ee67727fb4cd5008004a0657d689481
3 files changed