Merge "[NS A42] Move writing to the reassignment to the computation" am: 9b8a767cd6 am: 25d888115a

Change-Id: Iebe3dbd3b98f4b92486e86c48b0e50b6713b2aa6