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

Change-Id: Id9a3fc156879b32fce679cb368563b43d8add2ba