Merge "Change Callable to Supplier in the dpm resource apis" into tm-dev