Merge "Split buckets on boot complete" into rvc-dev am: affc08a3 am: 34632794 am: b4f9a759 am: 676ff7d5 am: 5c96fd4a Change-Id: I611154ba4c20d11d3e80b748f2c2cecbe4a258ed