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

Change-Id: Icd6e1500d6c8fcf3351e7bb8f840074c22f7164c