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

Change-Id: I964cf89d0b0fb8f0243a6e97fca3275a0b5932f4