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

Change-Id: I548579a05c05a01df05c6fbfb82315e53d90bd78