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