Merge "Adding buffer time for periodic jobs run near the end of their windows." into qt-dev
am: abe2321f1f

Change-Id: I947cded7d7956e87c41d259c31c175973958a9ca