Alphabetical order of modules

Change-Id: I0cf32d08fa85a882b5d1f84641dbfd290c09086d
Merge "Alphabetical order of modules"