Merge "[NS A40] Read current reassignment state instead of global state" am: 85a6565897 am: 9a5ad31ce3 am: 67b1c93260

Change-Id: Ib34a50288317259cb3e3f7d631dff614485129a5