Merge "Flush the partial bucket when startd shuts down or config updated." into pi-dev am: 9d4c397781
am: 585fc9d7e5

Change-Id: I133e83e9ad37790f0602c03110e23f6f000f0822