Merge "Work on issue #36891897: Need to ensure foreground services..." into oc-dev am: ef0554438f
am: 84795f778b

Change-Id: I90d6e150b6dcfe7665b5c1b7db84dd04a7d0d824