Merge proposals dependent on lp://qastaging/~charlesk/keeper/lp-1614657-fix-percent-done-error-in-helpers-test-failure

1. lp-1614657-fix-percent-done-error-in-helpers-test-failure
2. Dependent merge proposals