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

Change-Id: If30ba4499140e3553f09d32b157307a53b5cfc15