Merge "Remove dead module definitions" am: 67e0c02521
am: 1f59e369f3

Change-Id: I68668e7d01d32039a25c065face5b5c01e014150