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

Change-Id: If0509f61ca65ee4003412e5a00407309d391e414