Merge "All kinds of little foreground services fixes." into oc-dev
am: 525044e987

Change-Id: I5bd49a0e56bb5a5c08a20f38ce3801be1cb5dc1b