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

Change-Id: Ic9ea1c879cfcf145f569a388b52c6b7de0e8bb87
tree: dfa14380948b453d4ca41005e7959d1f807b816e
  1. core/
  2. services/
  3. tests/