Merge "Split buckets on boot complete" into rvc-dev am: affc08a340

Change-Id: Ib07a282cb2c3063417b25d7fb7dc525c152acbad