Merge changes from topic "NS-A44_lingerstate" am: 34587c19ce

Change-Id: Ibec8f280ad0b256d3d9b065a541063fc63d5a356
tree: 5e193e7358ec7493655b7f81c45ae7cc7e6534a2
  1. core/
  2. services/
  3. tests/