Merge "Remove unused system_modules" am: 93318a40ee am: 36c0262bca

Change-Id: I5ca4faa4ed784c0c922da928ea9b7e66f8aec053