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

Change-Id: Ic04c72d0720bb53a38329dbcbc75cd914e1296c0