Merge "Foreground service notis must be correctly formed." into oc-mr1-dev