Merge "Backport ChooserTarget package source check from N am: 82b9565bd1 am: 6d5f80d13b am: 7ac638702d am: e7e49b48b2" into nyc-dev