Depends on I5d42943a0 in VE core. Bug: T114689 Change-Id: Ib64a1184132fbf62f38c6bd5dde689acff7b8ae5
Per new naming convention (i.e. to be consistent with ve-graph). Change-Id: I3eae4ce011f0078b204d882a8068f844cd19daa3