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

Change-Id: Idc57b2a5953b0525d7c51999bcefdba868c68e16