Merge "Remove constraint inside SearchTarget to only allow one android primitive to be set." into udc-dev