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

Change-Id: Idf833e388c4c2959f56ffa00befdda4e4a71001e