am: 6d5f80d13b
* commit '6d5f80d13b06d439db08fcd5d25490edb322f923':
Backport ChooserTarget package source check from N
Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799
am: 6d5f80d13b
* commit '6d5f80d13b06d439db08fcd5d25490edb322f923':
Backport ChooserTarget package source check from N
Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799