Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043  -s ours
am: beb14f16fd

Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15