Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
am: f10b0d000e

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947