Merge "Split buckets on boot complete" into rvc-dev am: affc08a3 am: 34632794 am: 3fcec772 am: 409ddde1 Change-Id: I2f265e9ee36bab5cab05a4cc121ab851114daac1