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

Change-Id: I0051a01a498d77e0dea10ce31c51912b7747b551