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

Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8