Grandfather in a few more modules

Change-Id: Ib8fe72fd91e432219323523f6c242cb6210145cc
1 file changed