Implements: blueprint client-reset-state-improvements Change-Id: Ia375cad09aabb94d71090bcff76f04dab879d684