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

Change-Id: I47587b68036a563553f1de2c9f37e1255fb6d770