Fix broken grid module dependency

Change-Id: I8c22a68392d46cc9042c139abfdbc7c51656a3c0
Merge "Fix broken grid module dependency"