Merge "Change two helper methods back to be public ones, to fix issues of mocking them in KeySyncTaskTest.java"