Merge "Collect background stats: scheduled jobs" into oc-dev am: f68766f666
am: 30a17ef2d4

Change-Id: Iadaf59301437e27809010b7b3ce98fdd176be0c9