Merge "Add device state information" into rvc-dev am: 992674b60a am: db89a79826 am: f791b2eb7a

Change-Id: I93e61469dc5fc12aaf99636d7642a84bf2ad88e1