Merge changes from topic "NS-A44_lingerstate" am: ea8483c0f5 am: 8f13cef9e5

Change-Id: If045bc0da9babaf9d5a67031986c1fe4d75f2dc3