Sort modules alphabetically

Change-Id: Id8a0daabe6204e2a4c52d702e29d891fd80b89ae
Merge "Sort modules alphabetically"