ddf8ab0f4a
It is less erroprone to assign the new value immediately after we have changed for a change. Test: Manual Bug: 222552955 Change-Id: Ief79ce0b25587c6b6e4f41e82b33692b06b5d083