Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
am: 47cfac6803

Change-Id: I1de87ba1e5d14f5f9bd66cde733517e3fc5e71f3