Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev am: bcc35f5ae6
am: 886d8b1c00

Change-Id: I232b0239d0af7d211cb91496a1b35646864a4032