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

Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150