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

Change-Id: I12ca40b29588c651c77d272bcde87fdbe8037f60