Merge "ahat: switch to using new dominators API" am: 06a45b7588
am: 80e81f3bdb

Change-Id: I38e43953a02557c2d496523715b82b390d57c149