Merge \\"Fix #29737133 : content-trigger jobs not running properly\\" into nyc-dev am: f480698298
am: defa943074

Change-Id: I8f5f98b47804ade4eabd4f03a0d842ec4553816a