Merge "Add a more flexible Dominators API." am: f1255887da
am: 433ca9c0ba

Change-Id: I670b78a152edac88f8e594bf94c1e7924b953eb0