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

Change-Id: I74d90a707ab3cb7ced185995caed9fa6c0a17f28