Interfaces sorted in natural order

Change-Id: I408e69d822906dbcc987ceab10814499bec2d161
Closes-Bug: #1394943
Merge "Interfaces sorted in natural order"