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

Change-Id: Ida11915b0de672940ae6354abcc0ae98636ac072