Sorted entries

Change-Id: I2bf0616ba7db6677ab2dfbc0c887877bd48e7b51
Author: Diane Fleming
Merge "Sorted entries"