Merge "Fix incorrect interpolation of active bucket for partial requests." am: 96e15285ad

Change-Id: Ibfaf1e3d13ce758323c30381ba44702b6016d9eb