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

Change-Id: Iea3dd60c29485e933aaf9ec13c5422b6a89f0e39