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

Change-Id: I20274b76599f9865a4e091a3b6e2d84c3bad77b5