Merge "Fixing service notification on secondary users" into oc-dev am: c1aaede528
am: 2297f7ca50

Change-Id: I3183fd7fa37f061c6a48b07308514d0829552c45