Do not update state on the client side (#13743)

Change-Id: I2e1d714d1bb07db127758cf3f2d741ac50884266
Merge remote-tracking branch 'origin/master' into 7.2

b617f03 Do not update state on the client side (#13743)

Change-Id: I1bc4f8eda115a5a1271291f8dbbaa69e9034d24f