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

Change-Id: I5123fabe0976652cecf31fa3c786fa4f10a4e1dc