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

Change-Id: Idb212ed32d62234a794f66456a43a54057f3b260