Merge "Merge "Fix state deletion for transient backup issues." into rvc-qpr-dev am: 2170ba0f" into rvc-qpr-dev-plus-aosp