Merge changes from topic "NS-A44_lingerstate" am: 47be84c872 am: faadf36430

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