Added Choice policy constructor
(cherry picked from commit d1936042a9d15e3d875f74a84954c660bd6d0dba)