Merge "Prevent StubKeystore from crashing scheduler"