Merge "Sorting and intrusiveness updates" into oc-dev
am: abfa176b45

Change-Id: I238c7b739ed7bf359804e9488cf13c27fbb21d2c