am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev

* commit '4e678ff89d17bc0dbd18517a7187ea385e5e1d53':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets