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

Change-Id: I6a5022b47441560f1bffe0b2673cddde2ab9cf3e