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

Change-Id: I8fa6a0c035f52a9e80817eff1e1d42e91620e049