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

Change-Id: Ibdfe082f03ea9717e9313ca78060b1cc9c50118c