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

Change-Id: I72ee7ff7d9dd92a2aa61fbc0b0e7c79dfdf9eba1