Merge "Fix strict weak ordering requirement of less than operation"
am: e82263dd74

Change-Id: I56d837bd4429d13fd9a77ce43b0cafecfc243ee5