Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Fix for replenishing schedule Change-Id: I730b94affa2d456223cddf286c3628a5bdfa4bf8