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

Change-Id: Ibec8f280ad0b256d3d9b065a541063fc63d5a356