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

Change-Id: I890f0e8e36b5c397365af8d9eb7f84d1d9a7a719