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

Change-Id: I3a7df5061e0a2a90231072a5cd3e8c799302b346