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

Change-Id: I8f0022a85d9a86c71e421654542b9082d2231e0c