Merge "Make criterion available to product and vendor am: 80f4576f20 am: 0b7b5b10ee am: 1c97b1c013 am: 177754b27d am: dc42311d2a"