Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into...
Merge \\\"Fix issue #29371078: Foreground jobs should not count...\\\" into nyc-dev am: 47cfac68 am: 403e103e
am: e0223300
Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8