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

Change-Id: Ifd80980dc28dff021962befc7ed5d2538f7d350c