Change-Id: I8dca48f45ee0191aae678c45d79c5841836d428e
The old role will be kept and include ensure-go for backwards-compatability. Change-Id: I4e6345563817057a6c47c124b9ec8b0c62b057d6