Merge "Foreground service notis must be correctly formed." into oc-mr1-dev am: f2c00946e0
am: 570c6a499d

Change-Id: Ie4d3dba6518327910924b9fc5404dde75be0e245