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

Change-Id: Ie23c44a463fdd07be590c136fdda55bc0f6f0220