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

Change-Id: I644cf3173134c0aeb2cddcb8add85803aa76b362