To fix inter-module dependency Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
Former-commit-id: 4c5ace385f1a9b9ceebb774022bbc001b69a3bb4