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

Change-Id: Ic9ea1c879cfcf145f569a388b52c6b7de0e8bb87