Merge "Merge "Fix issue #28477006: Add small event log to job scheduler" into nyc-dev am: 27c279d5c8 am: a120ccd4a4" into nyc-mr1-dev-plus-aosp