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

Change-Id: Iac9fde0171a021a19398d0f83d91aa00a5050fdf