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