Lists should be ordered

This makes them easier to compare with diff-like tools.

Change-Id: Ie901cc69435ee1a424b465d2e659bceadba46299
Merge "Lists should be ordered"