Re-ordered methods.
Re-ordered methods.


Former-commit-id: 69ec06d72e0d2acd4f4d71561efe4de08b75a507
Former-commit-id: 960dbdad01f72c85800f5053057d31194a08f1fe
cschladetsch/KAI,cschladetsch/KAI,cschladetsch/KAI