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

Change-Id: Ifb057f05a1375016bc293fe45dab29bcab5ca1ca