Merge "Split buckets on boot complete" into rvc-dev am: affc08a3 am: 5bd209a9 am: 863abb62 am: cdd46c58 Change-Id: I545eac61d8e81120e492f5f8c7ae4afe01acdbc9