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

Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc