Merge "Fix partial bucket unit tests." into pi-dev
am: c3d0798455

Change-Id: I44f0aa78defe58a6c04411d76d97631fb808305c