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

Change-Id: I1007a52cc059addf0e583122866d79cdd5355646