Merge "Merge "Fix periodic job scheduling." into qt-dev am: e2d64ff898" into qt-dev-plus-aosp
am: 63f0427aa1

Change-Id: Ib69f89174d855e4fc9b4caacb1e9afd8b642a8d2