Merge "Remove device state when device is reset" into rvc-dev am: 104600438d am: a0a83e2fc1

Change-Id: I866e024e71a75b78e86423760f29667228848168