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

Change-Id: Icd720ef0e675473039613fe2f77789735f8c559e