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

Change-Id: I897076fedc74a810e4eaeb530c496219e26ebbf1