To fix inter-module dependency Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
Former-commit-id: 932ae2aab020f956d3fdb91107f6842ff292aa08