Only accept cohort in app that matches product id. am: b1e063a383
am: 22e0b4fcbd

Change-Id: I0210def4f8ffb1078740942f292f7985a3f9ba01