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

Change-Id: I957ae07c46573f0e6a066cc1cb0a27b8bafe5811