Merge "Backport ChooserTarget package source check from N am: 82b9565b am: 6d5f80d1 am: 7ac63870 am: e7e49b48" into nyc-dev