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

Change-Id: I94a6674bcb0327bc55fbfc1d18c4a5d6d723a52e