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

Change-Id: If7fc3f8d859cfa7ba0bb7d638dbe5cae741cae71