Merge branch 'stable-3.2' * stable-3.2: Fix for replenishing schedule Change-Id: If7a902d7bdebcbf385041009352ff1aefa977032