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

* commit '57628b6295b55c1be020e4bacc930af9c9fe6af9':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets